Checking in before modifying Modifier
New tests, things compile and actually work! :)