[WIP] Lab5

Updated code