It'll get less clunky in the future when I get some time to fix a few bits and bobs, honest!