Finishing up the marks code