Working build with Gerwin's template