Update

Cleaned up and added more functional user interaction