Some work on states. Need to go through everything and kill any and all possible memory leaks.