moar things
merge homepage conflict