Refactor the modification of props to emit events

[JackWilb]

Currently we have a couple instances where we modify the props instead of emitting an event to the parent. This is not best practices and opens us up to bugs.