Work in progress for next version, quite a mess right now.