Cleaned up includes
Keypresses new use std::function callbacks