Finally ran my calcs for Juana; I'm hoping I did them right lol