Shortcoder almost done