adding placeholder for img
merge conflicts
commenting out unused code