New location
capiTalIzaTion conSistency
Merge pull request #5 from kevinchandler/master

new location stuff