Finished Coding up to the run current model