hw2: merging in controller
hw2: final?