Added some Variable Classes and more work on Variable