wip better but no there yet