WIP: more work on megastore, etc.