Making some progress on software section