cohesion sort of working
merging