Yay, things work again!
WIP, CLI running