Some updates to bring project closer to being able to compile and run