Fully functional state. This is before attemped shortening of code
Shortened several methods, added to code_test