Huge Revamp

Apparently git wasn't working previously.