started rearranging features (not finished yet)