Support machinist

@morrisco @devanoff @cwitthaus @jwood This is ready for review