Various Updates - Code still not compilable