Working again, needs logic fixing