tweaking shiz
merge conflicts, I shit 'em