Do some CAD work

Cancelled