Cleaning up 0c0e402d17b8fdf5156ef38ba9e742430b54b7d7

* Working on Messages interface
 * Some reduction in functionality for this purpose