Checking in the current state of r_star, havent made all the changes to this copy but thought of pushing it in anywaysls