Opened up issue, added comments and error checking to location