I have it more or less done, still need to figure out one issue