Added main controller, corrected build