Work in progress System B

Some of logic/functionality there.