Updated version of lab 2, kind of completed