Made some additions to a plan which are currently commented out, waiting on some other updates.