Working on both those things rn