Major refactor of internal methods, add body class preservation.