First Commit with all Chris' work to date.