doing more stuff
merging shit