Works well. Cleaned up a bit.
Reorganized