First pass at getting it integrated into apportable