First and Second Layer now work 60% of the time.

Signed-off-by: chan94306 <chan94306@gmail.com>