Major code changed, lots of functioning code at this point.