migrated stuff in from logo prototype