Updated, still only half working.
Updated, still only half working.