fixed warning of adding raw datatype
moved to an arraylist - lookin good
totally misinterpreted the problem. solved
compressed refactor
compressed and slightly optimized