Lookup up works now, cleaned up a little bit