nothing here
resolving merge conflicts
resolved merge conflicts
removed most global variables and made executable read levels