first steps to integrating TWL into project
fix conflicts