Changed over to using EmberJS