prepared for submission

not perfect, but it's getting there