blah:
changed some stuff up
merging