Filled out all "wish-list" functions.