Development

Final merge before submission, friends.