changes, not done yet

not done yet, just code analysis for now