Merge pull request #4 from DLavin23/master

last weeks refactoring
fuuuuuuckk