need to fix how we save shit