Initial Commit V4

Added a new bug and did stuff