Still trying to solve extension part. Getting there