Converted to AMD. Minor style updates
Add filtering capability