More work in progress and two new helper methods