Added pagination, better merging of components, and cleanups.
Version bump to 1.0.7
Forgot to remove commented code.