Merge pull request #20 from bbttxu/workers

Workers
adding some testing for andys, cleaning up code