Cleared code a bit
forgot to add files
resolved conflicts