Causing Failures... fix those in class?