bs072414, Killroy 1-3-10

Forgot to push this to Github after the last changes.