[WIP] Aerotech upgrade

I need to test this before I can merge.