Merge pull request #12 from Thumperrr/master

Framework overhaul