here goes

will this work? MAYBE
merging changes