Updates, started adding tests.