WIP - new startup index seems to work