Added all requisite methods, added test statements in main