Adding in Chronos and refactoring some unnecessary parts out