Version 1.0: - Major overhaul