updates

Updates, code works fine just needs some better structuring