Finished rename and added query/task ideas