Major refactoring; Milestone 1: Feature complete
Bugfix for placing target