Made more robust, just needs to get SD now