First pass at using properties and binding rather than explicit calls