Brought example and calculator in line with new classes