Hooking classes together, Code Cleanup
0.4.9 DEV 132942 update