Fixed some awkward Program code, started implementing Quads