User interface functional, helper for storage still not working correctly.