Removed ostr
Refactored pdp
wip
wip
refactor cpu
Remove D
Merge pull request #5 from davecheney/refactor

Refactor