Project resolve (13/35)

Project resolve