pushing epic changes

hope it all works