checked to make sure all fields filled out.

+More data structure work/debugging.