finish dev on this part. will merge now