Beginning refactor, some bug with Instant.now()