Pushing initial work
Need to update templates per Distro + blowfish pwd
Added templates and testing
commiting all the things