use es-class for fs-storage
yeah nah
move some code around