add lots of shit
fix conflicts