Prepare for the next round of development

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1349/