Adding spec instructions, and some todos