Working my way towards a usable package