Finished off Logic.v