incorporated new stuff into refactored branch

it’s a christmas miracle!!!!!!