Merge Titaneman and your fucking zappy

Ahaha I merged yours again bastards