working now, need refactoring and add project and new columns