Initial commit of Com-Note fork