commiting stuff presented 6 days ago :(