good work, lots of TODOs
forgot some new files