DISK REFACTOR WIP