Added A LOT
Merge pull request #1 from msanders-lg/msanders

Added a lot, incorporated listener into main class