Work in progress
Work in progress #2
Removed incompatible methods
Added more test units