Fixed formatting issues
Added initial supoprt for part 2