Pushing working version with bugs