wip

it's been pretty busy lately so it's taking a bit longer to complete,  Should be ready next week.