Mostly console work (clean separation into 2 libraries for client & ded)