diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicListAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicListAdapter.kt
index 0de4ba55..9cd13d2a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicListAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicListAdapter.kt
@@ -4,6 +4,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
+import io.realm.Realm.init
 
 interface EditableDataDelegate : DynamicRowDelegate {
     fun setValue(value: Any, row: DynamicRowInterface)
@@ -27,16 +28,13 @@ interface DynamicRowDelegate {
 
 }
 
-
 interface DynamicRowCallback {
 	fun onRowSelected(row: DynamicRowInterface)
 }
 
-class DynamicListAdapter(delegate: DynamicRowDelegate) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class DynamicListAdapter(var delegate: DynamicRowDelegate, var callBackDelegate: DynamicRowCallback? = null) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private var rows: ArrayList<DynamicRowInterface> = ArrayList()
-    private var delegate: DynamicRowDelegate = delegate
-    var callback: ((row: DynamicRowInterface) -> Unit)? = null
 
     init {
         this.rows = delegate.adapterRows()
@@ -58,7 +56,7 @@ class DynamicListAdapter(delegate: DynamicRowDelegate) : RecyclerView.Adapter<Re
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val dynamicRow = this.rows[position]
 	    val listener = View.OnClickListener {
-		    callback?.invoke(dynamicRow)
+		    callBackDelegate?.onRowSelected(dynamicRow)
 	    }
         (holder as DynamicHolder).bind(dynamicRow, this.delegate, listener)
     }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BottomSheetFragment.kt
index 33b4dc85..c1970ca4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BottomSheetFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BottomSheetFragment.kt
@@ -27,10 +27,11 @@ class BottomSheetFragment : BottomSheetDialogFragment() {
 		super.onStart()
 
 		// Open the keyboard
+		/*
 		val inputMethodManager = requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
 		inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
 		editText.requestFocus()
-
+		*/
 	}
 
 	/**
@@ -61,7 +62,6 @@ class BottomSheetFragment : BottomSheetDialogFragment() {
 	 */
 	fun displayDataForRow() {
 
-
 	}
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
index 55fb8e64..1b0d7def 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
@@ -20,7 +20,7 @@ import net.pokeranalytics.android.ui.adapter.components.DynamicRowCallback
 import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
 import net.pokeranalytics.android.util.PokerAnalyticsFragment
 
-class NewSessionFragment : PokerAnalyticsFragment() {
+class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback {
 
 	private lateinit var newSession: Session
 
@@ -35,6 +35,10 @@ class NewSessionFragment : PokerAnalyticsFragment() {
 		initUI()
 	}
 
+	override fun onRowSelected(row: DynamicRowInterface) {
+		val bottomSheetFragment = openBottomSheet(row)
+	}
+
 	private fun initData() {
 		newSession = Session()
 	}
@@ -45,11 +49,7 @@ class NewSessionFragment : PokerAnalyticsFragment() {
 	private fun initUI() {
 
 		val viewManager = LinearLayoutManager(requireContext())
-		val newSessionAdapter = DynamicListAdapter(newSession)
-
-		newSessionAdapter.callback = {
-			val bottomSheetFragment = openBottomSheet()
-		}
+		val newSessionAdapter = DynamicListAdapter(newSession, this)
 
 		recyclerView.apply {
 			setHasFixedSize(true)
diff --git a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt
index 08d4ee07..6687471e 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt
@@ -3,6 +3,7 @@ package net.pokeranalytics.android.util
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import io.realm.Realm
+import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
 import net.pokeranalytics.android.ui.fragment.BottomSheetFragment
 
 open class PokerAnalyticsFragment: Fragment() {
@@ -26,7 +27,7 @@ open class PokerAnalyticsFragment: Fragment() {
 	/**
 	 * Open the bottom sheet
 	 */
-	fun openBottomSheet(): BottomSheetFragment {
+	fun openBottomSheet(row: DynamicRowInterface): BottomSheetFragment {
 		//TODO: Give the data to display in the bottom sheet here
 		val bottomSheetFragment = BottomSheetFragment()
 		bottomSheetFragment.show(fragmentManager, "bottomSheet")