Up to p.159 done
Replaced individual State methods
Refactoring, up to p.168
Added grid headers. Ch 15 functionality complete