More progress towards wrapping CASTEP... not yet complete