Closes #1 - Image management