everything working except startup bug. Previous commit was a mistake