changed w back to , moved partial scripts into controllers