Lots of changes and certain things finally functional