Initial commit with lot of bugs