moved some necessary stuff, need response handling