quick debug
made location more obviously optional
all tests passing