Cleaning up. Commenting code. Moved things into PlaneState that are tracked in settings.