Finished and now I need to check all the math