New and improved and testable gem
Added base support for embedding