Basic Fuctionality added