still working on it
Merge pull request #3 from sixofhearts/brianxautumn-master

still working on it