working on controller stuff