Huge update ~ Now supports Marine as well!