Project 2
PS5 - EM code
Resolve merge