Last min modifications

Just need to get it working so I have something to show for class :P