moved project and added some functionality
resolved conflicts after removing special chars