needed more than testing :) Now it just needs testing.