Work Session #2

@Nearhan let's stay merged after each session if possible.