started refactoring startTargest, probably will end up changing a lot in it
completing merge