Added more of the dynamic functions

Well this is more difficult than I imagined...