Copied in everything from the old version. Seems mostly functional