intermediary commit for Client CPT

made some significant changes to the Client CPT and didn't want to lose
them.