added some controller functions
deleted some files
fixed conflicts