Some more utility methods.
Started writing tests.