Lab 2 & 3 added
TODO: styling needed