Separate logic form drawing
Update ignore file