Proper load/unload in states
And adding the verbose logger