Updated files to resemble new gem, trying to get it to work!