Wrote some stuff
merged changes