Fixed deleting
Added todos
Added $fs pointer