Initial commit with work done