first draft
cleanup resolution