Initial implementation @WIP to gem