Updating to new architecture.
Updating and fixing issues.