adding cut!s and getting ready for a refactor