Fixed a few errors for namespacing.
(ie I broke stuff when I refactored....now it works)