More code, crashes, will debug - but later.