Dev

Did a lot of stuff