work-in-progress commit on stormflash... not yet fully functional
no longer tracking stuff inside lib directory