added some style! need to clean this up some and think about organization