First attempt at adding the new features, untested, yay