changes to cell and stuff
 merge conflict fix
merged with josef and fought with framework