Some progress towards dashboard