Progress commit. Makes object constructor and switch case work