big ol' messy commit
merge result