making progress on features implementation