moving old code out
moving old code out
some apis
Merge remote-tracking branch 'RussDanner/master' into russ_master