almost done
merge log
get ability
mostly done