Updated

Added small amounts of functionality
Improved code layout and flow