wip
working wip
some restructuring
abstracts away coordinates