more work done! pretty formatting too