Bout to start changing things...
Reorganizing code.