Finish combining to one script, make nifty helpers