Added. Test cases work out fine. Compiles. TODO: mock build