Location

plist and half of the functions working; want to update master and ensure there are no git issues