Elliminate disk wastage. Closes #8