Initial commit of master child.
Added message length check and cleanup