Cleaning out some unnecessary complexity with the interfaces. Started documenting the existing tool and cleaning renaming.