Merged in previous commits, added in optional transition from cells