Cleaned all up. Version 0.05