BUILD: Rebuild complete except for incorrect decoding due to binary search tree - switch to brute force array for now