Beginning some work on a refactor and better file storage