hooked up but with some minor bugs
Merge pull request #2 from Bonza-Times/master

hooked up but with some minor bugs