ripping this shit to shreds so that we can focus on just the core engine
tidying up