some work on resolve