Add Wojtek modifications

Closes #6