Stuff I stopped working on pt 2