(#18) Starting to add new code.