Halfway Done

Almost there… still tweaking things