Add registration

Note: This commit breaks bookmarking (for now).