Continued implementation of lab4