Fork original

Fork from original class skeleton