Back to master - was too diverged. I am too slow.
readded fk projects to solution