Thanks! Indeed, I wanted to add more but there were a lot of things I didn't think to plan and time got me at the end.
At least I managed to finish something and submit. So I just need to learn from my mistakes and also extract reusable code from this submission to be faster next time. =)