rm hw2
added new controllers