Homework finally working