I think you can remove these comments now right? Otherwise this all lgtm