1. Move some methods into Traits
2. Add support for comparing chi
Works