step to making Daniel's code build with make
merge Mouse/Daniel's changes for make build