Refactor and tidy up of the usage of the RallyApi... Rally is still a nightmare!