now things are getting cray
merge