Couple of Changes

Still not working or up to scratch but getting there