RC1 Project Curacao with review comments implemented. Just needs header