Items 4&5 from the TODO list