Hopefully smooth wip 2