Finished state logic and added cellphone number normalization. Added tests for added content