Initial commit to make it build inline