A year later.. finish the code