imported HW4 stuff

Need to import extra constants.
might have overwritten some preprocessor stuff I shouldn't have