New sync, textMessage and Week classes... moving code around and ditching some google example code