start to modularize
partial conversion