Almost done

Need to get everything positioned right and then done