updated a shit load for a almost working demo, fork it