bugfix
recorganise
recorganise
base point up with to start some refactgoring
working better now