overhaul of whole project to simplify and work with newer versions