tested the check, its still broken but everything else is working. preparing for merge