Initial files with first bug fix