Hopefully this is the last commit... Everything seems to be working properly