Tidy up some stuff. Started Area classes, but still working over how timing and grid implementation