Initial commit with all but 1 optionals done.