Partway through solution reorg
Fix #81, Fix #82