Tried to get stuff working, almost there