Added intermediary variables, calcTargets stub
Fixed conflicts, updated constructor and moved private variables