Added some additional structures. Doesn't work obviously, just trying to keep a commit up per day