Dev 0.0.25

The Big CleanUp!