More changes to core.. doesnt compile yet
:wq