Melvin update

Melvin's all usable and everything now
@pconerly, please review