Minor Changes + Testing Setup

Will actually get tests for this very soon.
Actually included Catch this time
Tests Working.

That took waaaayyy too long. Holy cow.