Finished everything with optionals