Core Functionality done. Polishing Required.