I think this is good enough for now
Added another example
Test tweaks