Sorted the methods a bit so they are grouped.