Mechanics-focused development

Mechanics-focused development