Flushing out server controls, now more versatile, testable, and expandable