Started work on storage and favorites. Cleaned up naming conventions all over the place