AHHH
some changes
fixed conflict
image stuff  skinnsss
it builds