Reverting to Commit #4 b/c of issue with Images in Commit 5.