Mostly working at this point