Major Change

Reworked everything.