Toystore moar working -- this branch should all get squashed