feat 3/4 from #6 moved here
feat 3/4 from #6 moved here