Somewhat working now