CS for protostar

I would do a regular PR. But should be an easy to test one where we don't need two testers.