Readded models and added some controllers