Can we get this file broken up at some point? We normally have one class per file.