WIP: update things n stuff