worked out some compile errors, can't compile on OSX as of now