Lots more changes, Not really sure what I did. Oh CLI for changing mapping and all that jazz