fix concurrency issues, work on getting framing done correctly