alot of stuff
merged