Add CM make and lunch capability