Add options for percentage of cap used
Update TODO list