Rewrite

ill start on the rewrite soon!