This branch now includes all recent changes from `next`! It might have broken some things so @obigal needs to test it again, but at least we can now continue on this with all recent additions added to this branch. Addresses #145
