More infrastructure, added license