Additions to danberniers great lib