major progress, still early, so no useful commit message..