Feat/client display resolves #11