Combined Code

Still working on combining the to code since just combining them broke
them as you can see.