Very first steps and bug fixing