buggy-ish build, evening commit.

Bugs will be fixed! @simplyianm Would you like to fix this please?
Thanks :) Oh and add whatever you want, I’ll merge it and take it back
to the lab. :)