pushed initial branch
perfect timing
added stuff
fixed errors
fixed merge errors