Added time calculator and more functionality