beginning to get registrations and schemes in order a bit
refactoring registrations, trying to trim up the main object a bit