WIP - Got rendering working a bit smoother but something is still funky