Added an effing handle, so clean
while at it, start rewriting the test classes with moo too