Code re-use... restruct