Progress. Lot of refactoring. Started implementing SMS