Second commit. Begins Testing and fleshing out main.
Fixed merge difference from pull request #1