added all the stuff
for future development
finished merging