fixed controller not being called
still dupes of classes
cleanup