Work in progress on implementing classes