More work, implement idle calls
More of the same, fix peaks