new version/idea for both
testing things
what the name says
minor edits