Started updating the signalling to allow for more logic freedom