massively improved grid system.  accessaible at /test route
corrected merge issue