Code Cleaning
Moved out parts of attaching to own classes

Some of the methods would serve better as a static class to be reused,
changed character to capsule,