Getting close to something actually working