added a few scaffolds and updated case number logic