Work on registry [VERY WIP]