make tasks/services into dictionary
add USB key requirement
lots of updates