changed #define's to all caps -- functions finished and code compiles