whatever leftover shit to commit this is
merge vaishaal's stuff