Again tinkering with the classes