squash commits

dddd

fixy

:D

funnies

aat gan

almost done? D: