Started transforming into composition based OOP
diff --git a/lib/Krawfish/Query/Base/Sorted.pm b/lib/Krawfish/Query/Base/Sorted.pm
index 44c93eb..f2dcb51 100644
--- a/lib/Krawfish/Query/Base/Sorted.pm
+++ b/lib/Krawfish/Query/Base/Sorted.pm
@@ -87,7 +87,9 @@
 };
 
 # Return index to last added element
-sub buffer_last;
+sub buffer_last {
+  ...
+};
 
 # Points to the latest freed element in the buffer
 # (normally this is -1 to first)
@@ -102,11 +104,16 @@
 };
 
 # sub buffer_push;
-sub buffer_shift;
-sub buffer_get;
+sub buffer_shift {
+  ...
+};
+
+sub buffer_get {
+  ...
+};
+
 sub buffer_insert_after {
   my ($self, $index, $element) = @_;
-  
 };
 
 1;
diff --git a/lib/Krawfish/Query/Cache.pm b/lib/Krawfish/Query/Cache.pm
index 79490f5..db882ef 100644
--- a/lib/Krawfish/Query/Cache.pm
+++ b/lib/Krawfish/Query/Cache.pm
@@ -17,10 +17,16 @@
 
 # The doc_ids are not stored as deltas,
 # so sorting with offstes is supported
-sub next;
+sub next {
+  ...
+};
 
-sub max_freq;
+sub max_freq {
+  ...
+};
 
-sub clone;
+sub clone {
+  ...
+};
 
 1;
diff --git a/lib/Krawfish/Query/Constraint/InDistanceSpan.pm b/lib/Krawfish/Query/Constraint/InDistanceSpan.pm
index b4e2d4a..7df9472 100644
--- a/lib/Krawfish/Query/Constraint/InDistanceSpan.pm
+++ b/lib/Krawfish/Query/Constraint/InDistanceSpan.pm
@@ -22,7 +22,9 @@
   }, $class;
 };
 
-sub clone;
+sub clone {
+  ...
+};
 
 sub _init {
   return if $_[0]->{init}++;
diff --git a/lib/Krawfish/Query/Extension.pm b/lib/Krawfish/Query/Extension.pm
index db0baf8..2a8b504 100644
--- a/lib/Krawfish/Query/Extension.pm
+++ b/lib/Krawfish/Query/Extension.pm
@@ -21,7 +21,9 @@
 };
 
 
-sub clone;
+sub clone {
+  ...
+};
 
 # Check the configuration
 sub check {
diff --git a/lib/Krawfish/Query/Reference.pm b/lib/Krawfish/Query/Reference.pm
index a4b582f..ab0cba1 100644
--- a/lib/Krawfish/Query/Reference.pm
+++ b/lib/Krawfish/Query/Reference.pm
@@ -37,17 +37,27 @@
 };
 
 
-sub clone;
+sub clone {
+  ...
+};
 
-sub next;
+sub next {
+  ...
+};
 
 
 sub to_string {
   my $self = shift;
 };
 
-sub max_freq;
+sub max_freq {
+  ...
+};
 
 
-sub filter_by;
+sub filter_by {
+  ...
+};
+
+
 1;