my version with all extras(From Connor)

Adendum still alive