Re-arranged features and To-dos