still working through entering codes
resolved merge conflicts