Commit to save

private.xml
Added TODO
Commit to save

seems to work
Code Reivew
Core Reorganization
Core Reorganization
merge with master