almost finished...for now