added everything
added stuff
fixed merge errors