Combined and kinda ready for demo