removed broken stuff, added requests to main