Finishes Phase 1 and 2 minus the creating subs with links (needs fixing)