added becca's code, working on linker errors