pumped some fns in there, begun writing choices