Updated CAD, noted stuff to do