Resolve build issues. Lot's of TODOs in code