all kinds of shit added and improved, ready for demo but wishlist