Pre-Checkpoint III

Basic functionality complete, only minor aesthetics