Tons o stuff

Mainly a lot of changes for dispatch table building