massive update to skinny - total rewrite