Formatting implemented (partially), specs committed along.