recording things! also fixing the git merge issues... whoops