Begin adding better rem fallback