Project resolve (18/35)

Project resolve