finished moving variables and defines to the header file