pre/fix: fixes #2 and has preliminary code for offline-design