Removed some serious pieces and also added a simple matrix class