WIP-Added comments and adjusted features