Feature registration

So uh, yeah... this part is done.