Finished all the P3 Codenarc issues and several P2 issues