Added Market & Test, stub code for Library