Completed module and removed intermediary steps and will merge back into master