Sorry about the excessive commits! Trying to fix my dev env