Seems basically finished shortcuts, will test later.