Buggy, but almost done!