wip continued
wip con't