Project resolve (14/35)

Project resolve