Yeah, fair point. Thanks :)
Some of it was a bit rushed, to make it for the deadline, there is definitely room for improvement