I think this should have a controller of its own