Try this branch. Wip/stabalize