Redone for 1.5

Huge update, 1 machine actually works now