redesign wip & misc