adding jigs
merging some shit