more stuff, now just presentation remaining