All original functionality is now in place. Build works.