removing more code, nearly done with the refactor, workign on seeking now