Reorganize to be more like a sub