(Still) Under Construction

You know how it is.
You change one thing and then another and before you know it, the entire thing is an absolute mess.
Bear with me while I tidy up a bit.