A longer version of the wip I posted earlier