removed controller stuff. need to think about it more