More work on virtkick/virtkick#18 - needs some love from @malps13