Started fresh with working cmake branch