Finished reworking beta version.