Added new version of reshape function

Still missing some functions to work