Logic1

merge what I've done to master.