More solid commit

almost ready for deployment....