some rough wip update