New fork

Fork from original class skeleton