Added some actual functionality to basic