Making prettier/adding functionality back

getting it real goo up in here