Glue & more Build code
Add TODO