Closes #57 refacs and rollup done