WE GOT DA BASE
frickin merge