Fixing all import errors/conflicts on #23