Finished. Theoretically.
Yeah, well. Merge Conflicts, whaddup