this has been sitting in my folder for ages, fortunately I managed to push this a bit further -D gon