Resolve #1, now looking to add functionality