WIP: More files converted to Hasql