Added New class but needs more work on that