Total rewrite of previous commit to remove final fixed array.