ENH: Added code, finalizing things