Yay, size under control. Now, need some large cleanups and comments