Everything working! (almost)