Removing TODOs, adding features