Added views,  some functions of the controller changed, no real actions done yet