there are some crazy changes that seem like merge issues, need to talk to jack