Added basic location stuff