Functionality requested complete, tests passing; need to raise errors for invalid locs