Added more work on delegates, may be broken, currently