Working on #29

Pull request is just for testing stuff