Continue the hackery