9/4 code update

more code, new struct, and comments