core generation - still not ready
merge