Added progress. Still incomplete