start on features rework