adds some new files and views to the project
adds new features
fixes merge conflicts