Organising code, debug console, still messy.