Table approach done minus hack.
Testing data updated.