Some intermediate updates

Implementing Monte Carlo SWH functionality. Techplacement will not
currently work as coding is in progress.