Move to class system
Added consraints class
Added support for dissapearing points
Minor bug