v5

Moved all of the items into a different method