Updated
Updated with more completed tasks
Flagged that the rename is still TODO