Added controllers and functionality