BASIC MERGE, WIP

still not functioning: sun.
not tested on tablet, WIP, don't fak w/ pls