committing wip spotcheck code