Huge overhaul, marking as alpha
Merge pull request #3 from Spiffyk/master

Massive overhaul