added some stuff to controllers, models. close to done.