Working splitview but this is temporary due to different screens. We'll have to start this based on the screens
Merge remote-tracking branch 'origin/master'
commented wrapper and constraint for matching type testing