Starting new branch to get used to rebasing and flattening.
Barebones core location support implemented.