More code, testing things