worked on intra-team work stuff
merged