Probably need to focus on improving dev environment for a while...

Things are too messy