Fixes #5 - F trello

It is a bit quick and dirty in places but does the job!