Merged with Aaron's branch for tasking.