added new files, started refactor