Integration of many stuffs. More or less finalized