Forgot where I left off so here is stuff that has not been committed yet