some progress with core logic