final merge of Mike's and my Basics tab code
final merge of Mike's and my Basics tab code

samroberton/re-com,KeeganMyers/re-com,StephenCharles/re-com,ducky427/re-com,Day8/re-com,johnswanson/re-com,osbert/re-com