overhaul
Merge pull request #1 from HarryRein/master

redoing the whole thing