First update of the new layout, might need to merge master back in to make sure I have the latest files