move location stuff to nyi