Initial commit of new rework