Redone code

Redid a bunch of code