- Added interface
- Several bugs still in place