Revamp changes
progress
Merge fixes
It's Alive... ALIVE
Merge pull request #7 from Tickthokk/revamp

Revamp