Devon milestone 4 a

Should resolve ticket #26.