First Working version
Fixed a collection issue plus tidy up