Update to include icon
object extensions added

This includes new unit tests and more fun