started cleaning old classes to make them usable
solved mergeconflict