Achalguitar

Are these going to be added back in before the code is merged?