Flesh out class structure