Ready for Portal Port

Fixed up recording to work properly now as well.
Now to port over to portal.