#44: Added some implemetations and removed masses of code.