Added everything except 2nd screenshot