Merged code and shit