intial files and a few fixes for #33