merged everything. and it works.
merged all
PULL THIS ONE IT WORKS WOOHOO