Beta

Will check and fix bugs later