Some updates and moving things around.