Upgraded kernel, WIP