Refactor, fixed last reminiscents of fork; does now successfully compile and hook-up