Attempted to resolve binding issues... this is not yet completed.