First pass at converting to ng