first commit since everything wasn't working