Final touches
We ran through some testing last night and I will be fixing all the bugs we picked up today, hopefully if all is well after that we can get this rebase out today.
Not much will change overall, but there may be some features removed or improved. The features that have been removed are likely going to be expanded upon in the future so have been temporarily disabled until the rebase is complete.