Added everything we did to the master

got a lot of issues so I manually copied everything