Initial porting of Marc classes