Design overhaul, going with a modified version of Kasper