almost finish, clean up front