Added functionality to ready button and prepared to merge to master