Partial goal implementation still very buggy.