Got it mostly working now, just need to check against blocks