moving slightly cleaned up codebase from private repo