Initial re-work of Initial import