Bugs fixed, working on storage integration

Also changed the configuration setup