Almost done part 2

Still need license and all that jazz