Mike joe

we want to merge everything together to be happy