broke out more category funcitonality