Fuctionality

Not ready for testing