Extra stubs added... beginning work on hints