* appears next to element when change is made
Merged Tom's Stuff and fixed conflicts