Refactor & Date implemented.
Last commit before dependency tests.