moved all user functionality from mainBundle to this