Actually actually fixed markup and started rewriting client class