Followed up on the "unfinished" classes