Refactoring - still not working just yet
Added new Dockerfile, added template config