Add: Both methods implemented, remains fixes.