UI is almost complete, started to hack around the storage system