Refactored, had some namespace bugs.