i
merged
get it workin