Continued work on upgrading to 4.0+ framework