rework- starting to develop features