Original Commit with basic functionality working.