New Class working fully now.