More features added to basic program outline