Lasted worked on
Latest Fixes to get the project to build