Added more code from CGCC hack-a-thon