Revert "Updated/changed a bunch of stuff, check it out."

Reverts KV90/Test#1