Rewrite - First dirty commit to share the work on tabs module