start refactoring
more refactoring
some more refactoring
start on proper tests
CONF not working correctly
ensure default to None
Update tests
make function arguments more explicit