Fleshed-out modules some

Only have tests for base so far though