1 19 14 rollup

Rollup complete, compatable with client