started to combine everything