finish Location + tests
get CM calculations working + tested