Add some initial logic, it kind of works