Refactored some more and restored gooch rendering