Finished refactoring Chater