Dev

first look at recent commits