Reordered alot of stuff for better testing, improved the get make, as well as fixed ( hopefully ) the double finish problem