Had a tidy up, all works well. TODO: hard-coded versions