Starting to try if we can get something maintainable to work with
4.0 and 4.5.