Updating bootstrap file handling again (WIP).