Overhaul + Add devices

Mako now included