Trying to prepare this thing for packaging and failing miserably