Initial commit with current work