REname

Lots of testing. @ this stage score is 12/24. Marked code is tested and
OK