More fiddling. Not really doing what I want yet though