refactor names, start testing