Added functionallity from another temporary repository.