Beta Version 0.2.8

Cleaning code, still rewriting. Making it easier to add other machines.