Working through cleaning up the Fluid class. Rebooting the main JS file.