ugh merge crap and new post