In the middle of massive rewrite - pulling code from prev-scaling repo