More work in progress.  Re-adding all the GBObject draw routines
Touched up portal and cleaned up code