Add more types and interfaces

All types are now in. Just need to clean them up.