For #83, replaces existing system but doesn't use new features such as date, image count, etc.
For #15