We've object orientified the Javascript and improved the time mechanic