Cleanup of constants
Fixing merge conflict, starting to set up input loop