Various Updates
Project now builds