Converted to using maps
Started work on player input