Finally working YAY