pulling in my tweaks. still need to make it pretty