Added the rest of the instruction set and some other classes