Actually fixed markup and started rewriting client class