Component manager (not ready)

Almost there... just need to cleanup a few more minor things.