Started working on something more user-friendly