Implemented Geometry pass; also performed some code cleanup where it was needed; updated TODO list;