Version 6

Almost done