Whoops, refactored the whole thing. Starting to test Hydra