Overhaul of the source, lots refactored
Update synopsis