Starting to flesh out classes