first draft
fix formatting