merge baby
fixed problem over lunch. hopefully...