Moving things around and making using a different storage implementation easier