Cleaned up code adding more functionality
Updated with taking user commands