added some initial stuff, plus lib