WIP: Testing, Testing, bugfixes.

Issue #3
Issue #4