Make comments polymorphic and some other half baked playings