Updated to version 0.2, significant redesign and efficiency