added some frame shit
merging