Started implementing better way of handling class changes