temp store of stuff
Merge commit 'fe9e1497041bbf36b95028b119fadd1e07ae65b4' into fixingImages