whoops - left some prototype code in...