Scaling and trying not to break things…too much