Check core version - complete. ish.

Test further. Test also when upgrading.