Trynna pull
trynna pull from Tony and Tim
fixed merge conflicts
trynna pull from Tim
Been working on where the dir shit was breaking during load. About to merge with Tim's solution
Got rid of the merge conflicts...hopefully
Collection of Lottie and Tim's. Waiting on Tony