Basic resolve, not yet async. Async coming tomorrow?