Some incomplete methods added, will be fixed on friday.