Accidentally left merge stuff in
Back to using blocks instead of fibers