Will hopefully finish this up in a week